Merge RP1A.191031.003

Change-Id: I70b352b04dc94abaafcaff4a8235ce331d358904