Merge RP1A.200106.001

Change-Id: I252ed1d3edd08c92d4791f75235d5896a5466cb2