Merge RP1A.191031.003

Change-Id: I81cae9108cd653dbf07fdd43ec3092888122290c