Merge "Fix loop optimization in the presence of environment uses."
am: fae4d85380

Change-Id: Ia9b865e7894824a01369863bc62c8543bb37e0d8