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