Merge "Fix unused param warning"