Merge RP1A.191031.003

Change-Id: Idffe34fbfcd14443bd2872bd7f63644c1d460510