Merge RP1A.190822.001

Change-Id: Ic88482f7fef9feeb14917979ff1793ac22247ac3