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

Change-Id: I6367ccd4be8481364a3ad62395fca8ad4ffa6bb3