Merge RP1A.191203.001

Change-Id: I52f6d474c876267569c4883eb26662f5396ed66b