Merge "Snap for 11926842 from 9409581c44e3e57309bef80dc5a28213f7353394 to sdk-release" into sdk-release