Merge "Snap for 9679998 from a558e96b8eddf81188352f756694346c88775ccd to sdk-release" into sdk-release