Merge RP1A.191031.003

Change-Id: I0f6ea42620ccb77c15a31d297033f300ebe786f9