Merge "Fix signedness mismatch and integer underflow" am: b46a2f7dea
am: f0c4361770

Change-Id: I26e7851dfaa09f2efa2ec9a5fcef651367b074ef