Merge RP1A.191031.003

Change-Id: Ie7ccc74628832eb24a624836156fd0e05c211632