Merge "Remove unused variable"
am: 843ff0dafe

Change-Id: Ib29962d2809f74c68933ddb629219fd952f1d689