Bug: 151763422 Change-Id: I0ec118d4298ed1e689e1d045244062d37c02d659
mentioned in commit 8e59756b
mentioned in commit ed674e5e