Merge RP1A.200615.001

Change-Id: Idec3c623efd762dad3f6acfcfa6e51fbafcccfda