Merge RP1A.200106.001

Change-Id: Ic6f6d461647c465f335d119424b17fb3926f6f39