Merge "Tidy-up changes to time zone classes"
am: 020085b55b

Change-Id: Ifeeb8ebd6cab99af81258d210a381b43390f4060