Merge "Snap for 7487883 from 83532170126068eab179f512bced4b88ac38045a to sdk-release" into sdk-release