am 8b22ef66: am e41d2aed: Merge "Using robust equality check."

* commit '8b22ef66ef1a67333e2f1d4250d2c134b50ef91a':
  Using robust equality check.