Merge "Snap for 11630439 from 71fd7cf32c12308a6ed9dc60adbbfc5922d835eb to sdk-release" into sdk-release