Merge RP1A.191031.003

Change-Id: I8b55a688f278a34815ee0d0ce16de1c773b3df8a