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

* commit 'f86231f47faa81e41b86c77f4c4354ef6fbbbcb5':
tree: 2e40bb90aa0c2910110f800fb1dde6ef5bca890f
  1. InCallUI/