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

* commit 'c54f19059ac72a263736e3f49014b608663d3f7a':
  Fixed a heads up crash