Merge RP1A.190923.001

Change-Id: Iffdd1b12b6704a4e45e98437336f2948ebaed320