Merge RP1A.200720.011

Bug: 167588565
Merged-In: Ica9cd13410aaddd291c73c4f7a75fdc4b17f189a
Change-Id: I2c3ca1f0794de3b0079b4715f7ce6d33cd786bdc