Redoing PR #411 over here because the changes were obliterated from earlier
Redoing PR #411 over here because the changes were obliterated from earlier

infil00p/cordova-android,GroupAhead/cordova-android,infil00p/cordova-android,apache/cordova-android,jfrumar/cordova-android,GroupAhead/cordova-android,GroupAhead/cordova-android,apache/cordova-android,jfrumar/cordova-android,infil00p/cordova-android,apache/cordova-android,jfrumar/cordova-android