Revert "Merge commit 'ea2d0b6' into merge"

This reverts commit 6d50af1fc31dda7ed99be4968af1f080a003847c.

Change-Id: I9ffa915c8c462d8a1d3e190b2ee38b68fa8a0677
tree: be7906d4ed0937db59b975f2c0d032cf322c150f
  1. InCallUI/