Merge RP1A.200106.001

Change-Id: I66f0242317e7f63ca4a2528e55a3163221eaf163