Merge RP1A.200610.001

Change-Id: Idfc48b2deef2e661c73b606eca317f7205228320