Merge RP1A.200720.012
Change-Id: Iacd9891887569ec711a6ab208df5382a2ac6e3f3