am ce75fef7: Merge "Fix the build" into jb-mr1-dev

* commit 'ce75fef756bb0d1c433eabc7e49b64fdb7bd609d':
  Fix the build