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

* commit '193229a52a732f537e1f062426d1cc8d774bd2c7':
  Fix the build