Merge RP1A.191024.001

Change-Id: Ie7e584c5a4728816a98ae034c54aabc4cdd2f858