Merge RP1A.191203.001

Change-Id: Ia943ce0d0bfa621069be09f90cec9ef7c04ff623