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