Merge RP1A.191031.003

Change-Id: I3324f9ee32137c4e5fb3ba0a11093f7929d3635d