Merge "Snap for 10929834 from edb3101c45de5f9a32b44c881803af9a11969bda to sdk-release" into sdk-release