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

Change-Id: I371bf0aafb726b11c74bc1aa229c08ffad9d2f8e