Merge RP1A.200720.011

Bug: 167588565
Merged-In: I4c565040e9300bb7f6e98df1a5a878af5df9d1c7
Change-Id: If8a54f7b1c59104c0065820e67eb5f1038bcb8eb