Merge RP1A.190923.001

Change-Id: I75b6592c586f73e969a754a511c6cb5ef519943e