Merge RP1A.191203.001

Change-Id: Ic880a2de4d4441ecbfc78ef784c62d721966e4cd