Merge "Enable strict warnings and fix unused warnings"