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

Change-Id: Id0acbbabc0214b436931d559c3bd07b792b3fc57