Merge "Snap for 8952093 from 0ac94edaa71f5033042cc7aa3b266e64c41d9cba to sdk-release" into sdk-release