Merge "Snap for 11962796 from 9c9d9f9b to sdk-release" into sdk-release
mentioned in commit f06a3d1c
mentioned in commit 868b61a7