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

Change-Id: Ib552af862ebef1a8aa566c63a9ecaa62b1cebdfe