DO NOT MERGE: Fixing overflow bug
am: d41a470016

Change-Id: I62f5180d162988a04cfde264fe5861e83cd59d0a