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

Change-Id: Ia3e24acdd7fbc4c72e460c42c2f290e0608011a7