Merge "Snap for 9979206 from 6d669f96f2d8d339492ecb0b5ac386fc6d25e613 to sdk-release" into sdk-release