Merge changes I9fc5738d,If4eee63b

* changes:
  Add support for Android to use old Olson IDs
  Refactoring before changing behavior