Bug: 79597307 Change-Id: I3d371072ead160d735cd7cb5f688e5d3993e7386
mentioned in commit b86eecd7
mentioned in commit 08dc7214