Merge "Fix null check for BaseObj.equals."