Merge SP1A.210709.002

Change-Id: Ia25330e72cfc7f681396d916f4ab2ebd099c0f57