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

Change-Id: I2eeef5a9648952c8ea0bcb63a7625c4bbcf06422