Merge "Remove unused CONF variable and import statement"