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