Updated location code and defaults.  Android build.