Merge RP1A.200720.012
Change-Id: Icfcdf73ecc7e354ef7175b2a4ac34133d55bdc08