Merge RP1A.200106.001

Change-Id: I0978e9584f45cadb2a2231e1c5183baebc16b862