Merge RP1A.200629.001

Change-Id: Ic36ee544a3c759d0ac81d445419cb622fb69b80f