Merge RP1A.190923.001

Change-Id: I3aa32fe27b7a036340fc64f1c3878945b9d47b80