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

* commit '20a5d3317529ce573aa06ac2e4a0a1a5359f80d7':
  Fixed a heads up crash