Merge "Remove code using mTransitions because we shouldn\'t rely on ZoneInfo impl" am: 1029ef11c8
am: 9218d41b64

* commit '9218d41b644e93302d90347994721643d0395e60':
  Remove code using mTransitions because we shouldn't rely on ZoneInfo impl