Revert "DO NOT MERGE: Remove unused variables"

This reverts commit cb72f3643f475b70089e79108e16621787262e2b.

Change-Id: I10196a15fe92e281d4922f384f373a964ff703ec
5 files changed