am 2bd68b77: Merge "Fix infinite loop in GenerateIdentityHashCode"

* commit '2bd68b77b5bf43e77304ef97e9d096b0ad0cab32':
  Fix infinite loop in GenerateIdentityHashCode