Merge "Snap for 7821744 from 1b3024b1ed6cd7f2cde67d267249d751ce7cd05a to sdk-release" into sdk-release