Merge RP1A.200515.001

Change-Id: I23a2510984ae760c021e5c8d164e39eacc240686