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

* commit '2a902caab23819591570deacc1741677f7b21118':
  Fix the build