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

* commit '495425bbe206bd7b19d27204060aa9723846cfc8':
  Catch potential NPE
tree: 01cc8cda21690c7ba3beae1f9bbbac0bcc817386
  1. InCallUI/