Sync from android studio 1.0.1