Merge "Fix unused-but-set-variable warning"