Merge RP1A.191031.003

Change-Id: I6292c3a0cbb81462587f19d97b545bd14f12a654