Merge "Remove use of .INTERMEDIATE" am: dda5e96b14 am: 24ef58d163
am: 0dc087dff7

* commit '0dc087dff769ef5b1d44ad1f2e0f36cb053867a9':
  Remove use of .INTERMEDIATE