Merge changes from topic 'mwd-merge-050415' into mnc-dev

* changes:
  Merge commit 'b1c7028' into merge_try2
  Merge commit '214726a' into merge_try2
  Merge commit '5e2731c' into merge_try2
tree: fd2bdfcfdc602746ca13ce4a3a80bc8154ab856b
  1. InCallUI/