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

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