Merge "Snap for 5925869 from 7a73a1f8e9fd691cb8f45aa9de303f3c39c3837a to sdk-release" into sdk-release