Bug: 73777445 Test: compile Change-Id: Id7f8d34f69c88f1706a4f218d9680426e1808408
mentioned in commit ca27efc3
mentioned in commit 51310e7b
mentioned in commit ae7ab505