Merge RP1A.191031.003

Change-Id: Ic4b72175237fea00ab6f44aa15dda67c93d4f0b0