Aligned code with the Google Maps Android API Utility Library standard