Merge "Snap for 5934975 from 90f4c2abe4701d264358fa8e56e28c926f62f3a3 to sdk-release" into sdk-release