Merge "SDK Manager fix: override in-memory sources when checking for updates." into tools_r20