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

Change-Id: Ic688d543deef59b711dbfe9dc171fddfd74b346f