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

Change-Id: I4abc4165123aa25e69c5f3aba95758ac56d0e76a