Merge "Snap for 11724015 from caba0695e4ddd08cce5c1563260b009a872efafe to sdk-release" into sdk-release