Merge RP1A.190923.001

Change-Id: I9a0293def75f76e73d582ab4e168348e67ed18b7