am 4e9d508e: Merge "Catch potential NPE" into klp-dev

* commit '4e9d508e08b3b7fe929a64d98d11a372a4a44045':
  Catch potential NPE
tree: 949080b72a97c4205d69cc392f5d8d41580b3cb3
  1. InCallUI/