Merge RP1A.200106.001

Change-Id: Ie47a087459f74cf5de462699225a3a1535e02268