Merge RP1A.190822.001

Change-Id: I51f371010993f11f1866aed19fc914011d5c13b4