Merge "Fix loop optimization in the presence of environment uses." am: fae4d85380 am: 20ebfb7f40
am: 62aab84961

Change-Id: I0e624ed77ef42bb9327b34ac06ff12c99fafc4ca