DO NOT MERGE: Fixing overflow bug am: d41a470016
am: 74d591a2d6

Change-Id: I61faf379f3cf35c6efd37176bc04685eba0f3cbf