Merge "Ensure environment is ready when populating loop." am: 6bca1c63 am: 83de4147 am: ee1fa875 am: 72279a62 Change-Id: I4e95d9d02ddb56290a23ecb76708905977f83013