[automerger skipped] DO NOT MERGE: Fixing overflow bug am: d41a470016 am: 14e3c066aa
am: fc7c779052 -s ours
am skip reason: subject contains skip directive

Change-Id: I494f5ad5228a937aae8c0ecdc8ca9439c4854c76