Avoid "unused variable" warnings
(cherry picked from commit 5f2488cbbaefca9bb756e0e8788fbae39c675421)