Merge RP1A.190923.001

Change-Id: I0ce506b6be24a607e2e108216e946a73dca14d17