Merge "Fix SdkManagerTest2." into studio-1.4-dev