am e8257991: am 2d01066d: Merge "Dissociate uses with environment uses."

* commit 'e82579914ea1793fce52fd9fcd8d1ddb13a73bb9':
  Dissociate uses with environment uses.