Merge "Enable strict error for warnings"