Merge RP1A.200615.001

Change-Id: I444e53bc6f60f07a4c9118815f3e9e04e2cd64b8