Merge "Fix build warning"