Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev am: 779c726a7a am: a289f96778
am: 9c763fb49d  -s ours

* commit '9c763fb49d7155a2251a582d0a2ecce4d6c9120a':