Merge "Snap for 7183507 from c8dfeb23d36a9a915d501dc65496a140c71b9917 to sdk-release" into sdk-release