Merge "Fix comparing int32_t with INT64_MIN" am: b5ba1eb0a0 am: bacbbf5a63
am: 1704e2ef6e

Change-Id: I15fdab6ae06a935d1586e44c98996ad7bf029288