DO NOT MERGE: Fixing overflow bug
am: d41a470016

Change-Id: Ia6c473365781796e0b54dc1fcf62e0eeab7a3794