Merge RP1A.191024.001

Change-Id: I6e1c56a28e8ca15af29c2706b36bf516c6de616e