Merge RP1A.190923.001

Change-Id: I1fe059c86dde8f64b1beee240e5e5d13df9bab1a