Merge "Fix "avd name" bug."