Fix loop optimization in the presence of environment uses. am: 565cd4e986 am: 778188ffea
am: c062aa6fec

Change-Id: I81e10466bc3dbb74c8487ba842253d00150bb1a7