Merge RP1A.191212.001

Change-Id: Ic2df50266bd318c8f8abc88d98f82871eb9b6117