Merge "Snap for 7183507 from 876f2ca76dcaa95e90ed20b67833780a600fd3c2 to sdk-release" into sdk-release