Comment out unused variables (fix compile warnings) Change-Id: I6cb38a8fa27f9f798235c9acf830873f8b47e24b