Merge "Snap for 4499105 from b34c1e94c5e770c4e80bc621d2a84b35414d9dec to sdk-release" into sdk-release