Merge RP1A.191031.003

Change-Id: Ib960756d4af6251a81d76584f3a5bd60bfc4b46a