DO NOT MERGE: Fixing overflow bug am: d41a470016
am: 14e3c066aa

Change-Id: I1c42c01159a62e6971648c6bd739ee6460634051