Merge "Snap for 5925869 from 9ada1719baf97231621e1af762181d5bd5c13e5b to sdk-release" into sdk-release