Merge RP1A.200106.001

Change-Id: I31ed26bebef00ac2d10c89b8e1bf75821a5f9ff1