Merge "Remove unused variable" am: 5281f56377
am: bf01f66de5

Change-Id: I83600792746b9a092d5174c0a9d8d12ac4be557e