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

Change-Id: I3f791ad53fee36b7857d3143e27db3da22ed902a