Merge "Revert "Save environment snapshot and use at fork/exec"" into nyc-mr1-dev
am: 7ae0862d40

Change-Id: I8cb8282d61aea83ec09bbcd68e9bdb329a02db51