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

Change-Id: I5cde8ce8008375b93f3f933924052e16ef214fac