Bug: 134763660 Test: N/A Change-Id: Ib2ccf36e7aa0e02132ccc1f8861115d8f58091ca
mentioned in commit 1f00df31
mentioned in commit 578d4b10