Merge "Remove unused variable" am: 843ff0dafe
am: 0662e869ad

Change-Id: Id0ea3e3c53261d20d842b8de0285518dd7b0e078