Merge RP1A.191024.001

Change-Id: I981c040184551bfb160bfa80914a8eced6cda80e