am 45873583: Merge "Add extra environment info to build output"

* commit '458735839a82d2d381edbe71ed924d309bf07c55':
  Add extra environment info to build output