Merge "Snap for 13198286 from a490e4ca to sdk-release" into sdk-release
mentioned in commit 53ec5b6b
mentioned in commit 33c1db07