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