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

* commit '62d509d24f91959b75219edd0ab1a6f22b82c600':
  Use java.util.Objects instead on internal API