Merge RP1A.200720.012
Change-Id: I1a61c409d8105eddf79bfd9d86bfd1a3dd0b1de5