Merge "Misc tidy up before adding geolocation classes" am: f211324bfc

Change-Id: I04f76a53b5226404b377a06cd410e12f4a1c3f54