Merge "Fix emergency call layout." into nyc-dev
am: 04abe42

* commit '04abe42a636feb6bc0055bd6e26b7017f9d97462':
  Fix emergency call layout.