am ad0f0edb: Merge "Call to equals() comparing different types"

* commit 'ad0f0edb54fd61048b64053d7eb8fafa6c84b119':
  Call to equals() comparing different types