Refactored location retrieval using newer Google Play Services apis