Merge "Improved and simplified loop optimizations." am: c1f24b947a am: 18173e50b8
am: 63b9e50802

Change-Id: I29f4983b6429b55ced027fb1dbc67e8dbfad4d9c