am b09173e7: am 30090e41: Set the intermediate dirs before using them.

Merge commit 'b09173e78936f65a7f128fda2383f9ed5abce2e0'

* commit 'b09173e78936f65a7f128fda2383f9ed5abce2e0':
  Set the intermediate dirs before using them.