Merge RP1A.191203.001

Change-Id: I9575562e7ea048d92c3a4ae7b6855fee6fa5eeff