am aa6ffd75: Merge "Fix the build. Exchange -> Exchange2" into jb-dev

* commit 'aa6ffd7595966808a60341a449745d3d03d88768':
  Fix the build. Exchange -> Exchange2