Fixes #4803: Move r32281 to v1.8 branch (Fix set-but-unused-warning noticed by jsquyres.)

---svn-pre-commit-ignore-below---

r32281 [[BR]]
Fix set-but-unused-warning noticed by jsquyres.

cmr=v1.8.2:reviewer=jsquyres