Merge RP1A.191024.001

Change-Id: I516d4b6c83c756c538f4d659a7fcb117700c54ae