Merge RP1A.191024.001

Change-Id: I30616aceeae3c97ac61e89f65594e866cb75c758