Merge RP1A.191212.001

Change-Id: Iaaa02ec31c0d813087eb6da3a3e712bac33eea7f