Merge commit 'b1c7028' into merge_try2

Change-Id: I7cb5298c37e1f07f8b1b234605a211c6478963f0
tree: e5d642612eabbe9fc6170b6d3b4b88d382b5350b
  1. InCallUI/