Merge "Snap for 7529902 from e0e4d25b594aeb0d6e30538dff58a437a7470e89 to sdk-release" into sdk-release