Merge "Fixing bug that prevented \'Emergency call\' from being displayed" into nyc-dev am: 624f6c4
am: 3023298

* commit '3023298a09f00b57fee6c2a3bc15c85294fa6ca4':
  Fixing bug that prevented 'Emergency call' from being displayed