am 9165daa8: am 6c24db2d: Merge "mako: remove setup_fs" into jb-mr1-dev

* commit '9165daa8814064b90837d29950ea8712d8149369':
  mako: remove setup_fs