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

* commit '1c48ac828ee205a8bd8052a6f17adfb965790432':