Merge RP1A.191031.003

Change-Id: I850e1ec928cba67e65c995be9ebfbbc21fa0de94