Merge "Misc tidy up before adding geolocation classes" into rvc-dev am: 71271db6 am: ac646f55 am: 8b294374 am: e81f8d12 Change-Id: Ida727c6d1a7eef40905e5b9373557c9af048b5a1