am 4bb5d199: Merge "Merge commit \'b1c7028\' into merge_try2" into mnc-dev

* commit '4bb5d199d90a9ec269372477455a9a93eef5e2c1':
tree: 2e40bb90aa0c2910110f800fb1dde6ef5bca890f
  1. InCallUI/