Merge changes from topic 'mwd-merge-041515'

* changes:
  Fix build issues after the merge
  am b04d61a..697f674 from mirror-m-wireless-internal-release
tree: 609852deffc666a424ccdac00f8db85694480aca
  1. InCallUI/