Merge "Snap for 10399941 from 762e56c958fb4e4c6189f93dc6ecd916c78f1c3b to sdk-release" into sdk-release