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

* commit 'd395ea124be07cab29eb7ee72526dbe79daa634d':
  Fix the build