am 0d30c930: am 38710f03: Merge "Fix crash when making emergency calls" into lmp-mr1-dev

* commit '0d30c930c39fb48bbec68158dc9a39d4fbfdff9f':
  Fix crash when making emergency calls