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

Change-Id: I306b90352f56913f158ad97c0cb34dfe64e18509