Merge changes from topic 'mwd-merge-052115'

* changes:
  Merge commit 'ea2d0b6' into merge
  Merge commit 'b219fca' into merge
  Merge commit '87caa7e' into merge
  Merge commit 'f5212e2' into merge
  Merge commit 'f28f4a3' into merge
  Merge commit '55fede4' into merge
  Merge commit '7a99024' into merge
  Merge commit 'f399ce4' into merge
  Merge commit 'f6bde72' into merge
  Merge commit '8bd143b' into merge
tree: be7906d4ed0937db59b975f2c0d032cf322c150f
  1. InCallUI/