Merge "Snap for 6660490 from 66db531ae640d2714d789e133f4988308089caaf to sdk-release" into sdk-release