Merge RP1A.200720.011

Bug: 167588565
Merged-In: I3d39080c843ada49ab75eb6c2fb4e69b40905356
Change-Id: I2e910257538c52e37e67ca9fe884daa80219415b