Merge RP1A.191212.001

Change-Id: I5df5029126d04b8410876b56aed19cb834de96c4