Sync with new env statuses

Change-Id: I8b87ed3cc6413a1de2d4b7e107f515380680af19