Merge "Snap for 5925869 from 53add29eb7b4eaa9e128e3ec84eac9e65cf4c986 to sdk-release" into sdk-release