am 37c69fdd: Merge "Use java.util.Objects instead on internal API"

* commit '37c69fdd826f3973966430adc1abfbefc19bc16e':
  Use java.util.Objects instead on internal API