Merge RP1A.200106.001

Change-Id: I144a3a7f0569b0690a349cb7e1656f41ba808bf7