Merge RP1A.200507.001

Change-Id: Icd864c4bcb51195b316c1dff77238e4b2f01747a