Merge RP1A.191024.001

Change-Id: Id6588f7437c5ae33764b91038d232c9a6246317f