Merge "Improved and simplified loop optimizations."
am: 6ed8fc7a68

Change-Id: Ia0364c2b78ea63ba55e345fc0decdfdca8c35dcd