Merge RP1A.200106.001

Change-Id: I4940910f69cd6548f07ff14f9b38d933e2073130