Merge "Snap for 7110675 from 7b9758c25fa08bdd86bb7a1779cae14299a5411b to sdk-release" into sdk-release