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

Change-Id: I2c4ac90e49a249414512c534f106f33d829e43f2