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

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