am 5360eb63: Merge "Correct the way of avoiding crash" into ub-contactsdialer-a-dev

* commit '5360eb6309b3ddab067fa92777cc244ebac94d37':
  Correct the way of avoiding crash