Merge RP1A.191212.001

Change-Id: I3bbad0eb15fa475a01bfda0a736251473bb9a601