Merge "Replace + by / to avoid vectorization of loop."
am: 4f1c5fa35e

Change-Id: I1cc2ed80088d2502d245a6b6d0c48f823adb0589