Merge "Snap for 5925869 from ae3172e5fcd27d6fb0e8291d69ca3d6077bdc289 to sdk-release" into sdk-release