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

* commit '2b4d636ee34b64923361e7c0ad3a50ed37f8126d':