Merge "Misc tidy up before adding geolocation classes" into rvc-dev am: 71271db6 am: da105f97 am: 6c01ecbe Change-Id: Idc02161a2f282ef4def1f05e6e0cc4564db19364