Merge RP1A.191024.001

Change-Id: Iaf43ea57c8d22ceeae532da3bc4ce216f58cc295