Merge RP1A.200720.012
Change-Id: I0b90706b6d008a30362488b2c89b7d99322c783b