Merge SP1A.210812.016

Merged-In: Idf95a75c8101246a2650fe69f476f9372b9cebd7
Change-Id: I407dc43fc27a6804ffbf1b0433fcd3a0734db6a3