Merge RP1A.200515.001

Change-Id: I08b086f4da389efca5125e7fc4a00193fd9602aa