am fe790a73: am 779c726a: Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev

* commit 'fe790a73fb7c0ec9773f591a281ab1dbb2c8ed93':
  Fixes associated with the tzdata 2015a update