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

Change-Id: I900cb0c0cfb7aac42c781d011dcdfcd07165e629