Merge "Snap for 11871564 from 1c3e44a2dae4dc55b921a8e12fbc8b71be3e69f6 to sdk-release" into sdk-release