Merge "Snap for 11790536 from f8ca4e1fe3cb5169eb09c5a6505b2a49f0100855 to sdk-release" into sdk-release