Bug: 68860345
Bug: 69058154
Bug: 151953481

Test: no code changes

Exempt-From-Owner-Approval: janitorial work
Change-Id: Ia5adfa8368e4a91268e7a94a59db5c2efb45090d