Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev