Merge RP1A.191031.003

Change-Id: I284437db2c3747328aa880071c5cb4093a93f9c7