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

Change-Id: I4bf0eb4cc4d4ee4ba99497f6ad6071b7ff215f6a