Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I2e4120a58752ebedb30d36f0a940d846c7ea6679