Fix unused variable build errors am: 0a9a1c1ba5 am: 7db2d96db9
am: 1ad6b8d037

Change-Id: I47a77ef905fd65984a391e79b6a7046cf1573dc1