Misc tidy up before adding geolocation classes

Misc tidy up / corrections before adding geolocation time zone detection
classes.

Bug: 149014708
Test: treehugger
Change-Id: Ia25d9f6bbf5c7c03e2cbb570b6b07e61bc0aa1d9
(cherry picked from commit 0813e0e2caa4bf6f45ff3b7c93dcca6bfd9378c7)
6 files changed