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

* commit 'c2555d1c81ecd21d7e30f63c5d030fd2682e3343':
  Catch potential NPE
tree: 2a728fa234ba230fe6ab7dd085b1cec3f7abc6dd
  1. InCallUI/