Merge RP1A.191212.001

Change-Id: Iabfd83c5c82b554198b3e40936add9872b867a19