Merge "Revert "4.6: Disable unused-but-set-variable warnings""