Bug: 77290928 Change-Id: Ib4811e75b5a798a10a4b107f7643a964c268d8f1
mentioned in commit 2c24fc08
mentioned in commit 3535aa94