Revert "Merge commit 'f5212e2' into merge"

This reverts commit 6ec53cb7908764ee464274bbebf02f8cd6acff8f.

Change-Id: I0a4b6acb5d3ba8768b43ec569b2b11b2161b3188
tree: fabdc816a435f7a07c0ac30bcd3b8abd4868935e
  1. InCallUI/