Merge "Snap for 5925869 from e9a785696bb3f08a05f28c4b3698b7f92dbaab70 to sdk-release" into sdk-release