* Down integrate to GitHub * Remove unintentional double assign * Change ByteCountInt64 to int64_t * Revert changes in binary_conformance_test.cc * Revert unnecessary changes