Merge RP1A.200720.011

Bug: 167588565
Merged-In: If6721904a50f164626d30460a2b13c59ffd2814f
Change-Id: I254b5fef3368a656c3f67cdab85623deb5399c88