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