Bug: 68860345
Bug: 69058154
Bug: 151953481

Test: no code changes
Change-Id: I5f01ab7bc77720e8cbcf1f0896b6793a6f86fda5