Merge RP1A.190822.001

Change-Id: Iba3b274cd13030ca02a917698eff3527ed406279