am 25720de0: am 23fe202d: Merge "Fixes associated with the tzdata 2015a update" into lollipop-cts-dev

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