Merge RP1A.200106.001

Change-Id: I3aaa7393f3826880b81d04c59f9081e3421d0641