Merge RP1A.191024.001

Change-Id: I83100b049d157a2ccd4158178a65ab1d3e5f0685