Merge SP1A.210812.016

Merged-In: I0b9a14345475e432b93f92c23010a8b39712443a
Change-Id: I79e2c0efedea1a3f52354c83645a6090dc6bc02e