Merge "Snap for 11211409 from c8e90923af2c88d96d6814202fd041ef2ac4f182 to sdk-release" into sdk-release