Merge RP1A.190822.001

Change-Id: I2b5686f8f5d1ef1736201ef15bf560f199eece40