Merge "Fix unused variable warning"