Merge RP1A.191024.001

Change-Id: I5b386de1d9776bce91ecd370e19cbeb5b31254c8