Merge "Misc tidy up before adding geolocation classes" into rvc-dev am: 71271db6bf am: da105f97a8 am: 6c01ecbedc am: e272a913e0
Change-Id: I531afdefaa4bf0ccd340633a791bcf35810b04da
This commit is contained in: