am 97a16d1a: am afc1b34a: am 1d1abc5b: Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts-dev

* commit '97a16d1ac217e0eb3fd4ec8fe8abc360aa969c60':
  Fix TimeZoneTest#testPreHistoricOffsets CTS failures.