Merge "Snap for 11841552 from 2fcc3a20e5bcef23ae968cce9c68354135d69a3c to sdk-release" into sdk-release