Merge RP1A.191024.001

Change-Id: I35bc9df14883cfdb911094d5105091e927492acd