Merge RP1A.190923.001

Change-Id: Idf8c7cf547b1581a48a53d9a31267ab1ff1f617e