Bug: 79597307 Change-Id: I4f2fd427a617a55587585932e35a2878955d87d3
mentioned in commit 899f54d8
mentioned in commit adbf0d88