Migrated to Android Studio 1.0.1
Brings in infowindow from another branch