Merge "Remove unused variable"
am: 5281f56377

Change-Id: Iea2e0259e55c5a76b1b7b4b46804f1bebfff24fb