Merge "Improved and simplified loop optimizations."
am: c1f24b947a

Change-Id: I8d8bfb2e2288f8c4f468a0d21fdf5eef45f10163