Merge "Snap for 11573087 from f21e60282ecb9242947d3ba88b0cb7029c0307a1 to sdk-release" into sdk-release