Merge RP1A.191031.003

Change-Id: Ia4e8200e10a9c8ea2382a2dc9a51a893ea067165