Merge "Snap for 11541002 from 49eb4d6a8baaa85e046f0a9fe9751da7dcce0275 to sdk-release" into sdk-release