Merge "Snap for 8782634 from c1f951f2b20b1ca4e75435eb6554e93a680d19ff to sdk-release" into sdk-release