am aad3762f: Merge "Fix build" into jb-mr2-dev

* commit 'aad3762f1bcc3e90c6f312669caa1115f4714669':
  Fix build