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