Merge RP1A.200619.001

Change-Id: Iba95695a89e8fb5730ce4fc2bb126e60fcd12a99