Merge "Ensure environment is ready when populating loop." am: 6bca1c6389 am: 83de4147d4 am: ee1fa875f6
am: 72279a62c7

Change-Id: I4e95d9d02ddb56290a23ecb76708905977f83013