Merge RP1A.191031.003

Change-Id: I07f635a659fb6904dc567ffcf86e3ff8bbc5588d