Merge "Fix NullPointerException." into klp-dev
tree: 568829b3dcbee43d1f7f9533596a857ea40c977a
  1. InCallUI/