Merge RP1A.191024.001

Change-Id: I54587cf0a521ceb7318bf970f3848fe9d44b254b