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