Merge "Fix comparing int32_t with INT64_MIN"
am: b5ba1eb0a0

Change-Id: I4ba8f23d4f376fbb36414def90a346e9c3091669