Merge "Snap for 7183507 from a7787ec12d91b06a9a383716a8baa089e11cad40 to sdk-release" into sdk-release