Merge RP1A.191031.003

Change-Id: I0a4207b1ee6f56d52e7f9079a9fb0ef11cca99fe