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

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