Merge RP1A.191031.003

Change-Id: I1fdb0b8e89c10f6f51179b009cc601e1bd1dfef4