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

Change-Id: Icc7d087cf9726aac9cf7c7a28bd24427f1e6969e