Merge RP1A.190923.001

Change-Id: I16972ac553a54235e2208c7e785a89719a0b42e5