Merge RP1A.200720.011

Bug: 167588565
Merged-In: I422be3cef5aee3990c81a6de6e2ae783a92a7fc3
Change-Id: Ia8bf8c3762c45c83e3054b07b89827ace26a486a