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

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