Merge RP1A.190923.001

Change-Id: I3e498e20f80eb4e0da321e698f13dc0d9d51a033