am b404ecc9: Merge "Fix build." into jb-mr2-dev

* commit 'b404ecc91a5dd3dd027554490b2ca18c1048bdba':
  Fix build.