Merge "Delay allocating environment locations." am: 9b70b4a806
am: 3c36d0a59b

Change-Id: I58aa6db54a20487c7ad096aa08f004f233cbb9e0