Merge RP1A.191024.001

Change-Id: If76cf4317982266d24196b0d3c6419ca339c6c7a