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

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