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

Change-Id: Ia8bb2cd028e8fb791982a7d442f2c02ed2329607