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

Change-Id: I0689c929961350c09651778aed5ab3a8f72cbad9