Merge RP1A.200610.001

Change-Id: I27091b68ca7a708913a7dbe526270863cd34979e