Merge "Prevent loop optimization in debuggable mode." am: 76754cc816
am: 5812a0ae78

Change-Id: I7cfc340214a94182f30c8fe898faa1a016b4f95e