Merge RP1A.191031.003

Change-Id: I26e90d17e83cb2361b9ba82d7d8c96992afa2b92