Merge RP1A.200507.001

Change-Id: Ibc2625f46b3cd6f9c8467efaed57803f6786e3d8