Merge "Use java.util.Objects instead on internal API"