Bug: 123976090 Test: N/A Change-Id: I8e04fd0b1a4dc77dfdab0bfd3b7c9618bfbad12a
mentioned in commit ff508e15
mentioned in commit 9586f006
mentioned in commit 07d1ee64