Merge RP1A.190923.001

Change-Id: I51e53001a553f15f9079f322fa4ec20ea7cd7e10