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

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