Merge RP1A.191031.003

Change-Id: Iaef17d39c0f493ebef549835bcd68fec69829451