Merge RP1A.191031.003

Change-Id: I98024152a289c582c9aff6bbae0f203d147c01d1