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

* commit 'fb2f9c0209708936408bea3b273d550aab6d4ec8':
  Fixed a heads up crash