Merge "Snap for 8952093 from 3f70a0dbc890d9f125c4090b4ccfd5157ad87a64 to sdk-release" into sdk-release