Merge "Snap for 9550355 from 68ebeac8291ee923d71f0ff9f0677037207c17fa to sdk-release" into sdk-release