Merge "Snap for 7861008 from b060a1bf356745cce95be7ae8b015342051089ee to sdk-release" into sdk-release