Merge RP1A.191203.001

Change-Id: Ic8f6bae2ad7437ebd9e50aab6138b3395bd98e61