[automerger skipped] DO NOT MERGE: Fixing overflow bug am: d41a470016 am: 74d591a2d6
am: a146b5430d -s ours
am skip reason: subject contains skip directive

Change-Id: I3b6644b7efde339300c15dfbde7c7de849c84ed5