Merge changes from topic 'mwd-merge-041515'

* changes:
  Fix build issues after the merge
  am 817090c..60db0ce from mirror-m-wireless-internal-release
  am "DO NOT MERGE Add ability to simulate missed calls"
  am 0be7b9d..b3e8a72 from mirror-m-wireless-internal-release
  am 959afe0..abcbce4 from mirror-m-wireless-internal-release