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

* commit '3f8a5ed5b4907cdaf0813e849e49131c82a3f634':
  Fix crash when making emergency calls