Merge ab/7633965

Bug: 169893837
Merged-in: I2cdd175793d51e42886e0b1eb31528afb2093b25
Change-Id: Id281ae04b60f6a38fba11d628a9537f986e33348