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

* commit '0437302f164f3eb1ba6a359ef5b3cd857facbbe4':
  Fix the build