Merge "Fix unsigned integer overflow of i, which gives SIGABRT"
am: 8db23af93b

Change-Id: I4ac6ed7acd6db7c1dca3105bb9fbdcb0907c781d