Preventing Tangelo loading errors for apps that don't use Google Maps.
Merge branch 'enron-fix'