am 48132b98: Merge "Minor cleanup of deepHashCode / deepEquals."

* commit '48132b983c042646324666fa401768f92e4713c9':
  Minor cleanup of deepHashCode / deepEquals.