Merge RP1A.200204.001

Change-Id: I029b79e2496c6779a1d0313f5ae6c960ad7243b9