Merge RP1A.200621.001

Change-Id: Ibd868f53f230edec4c46523024c38708b5a01522