am ead1bcd9: am ef2f97c7: am e14a5ef6: Merge "Use java.util.Objects instead of internal API"

* commit 'ead1bcd9a23a811b25a73e663c556c590e649d82':
  Use java.util.Objects instead of internal API