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

* commit '624f6c457596d40eff7756920e315faecaa1e075':
  Fixing bug that prevented 'Emergency call' from being displayed