Merge "Snap for 7925884 from 96fdc09881dba687586ca457d13729ed9e53b022 to sdk-release" into sdk-release