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

Change-Id: Ica891205599832f7b192ba553779e61459e0cab5