am 1b2bd2ee: am 7d1a4b63: am fb2f9c02: am 20a5d331: Merge "Fixed a heads up crash" into mnc-dev

* commit '1b2bd2ee9f5e728513c5643b26e4a6cd11da1c7e':
  Fixed a heads up crash