Merge "Snap for 13198286 from 3b189289d5457651829f2d14454b491e827bcb7f to sdk-release" into sdk-release