Merge RP1A.200123.001

Change-Id: I787b7be44c01ee57db8bb9383dcf8e1beaab1e07