Merge "Snap for 8005954 from ee4c6b0a8a48f1f5601e46d1a9531ae745262848 to sdk-release" into sdk-release