Remove unused variable and fix outdated comment

Change-Id: I0d70d49bbec6232c04ab7d43b0d9eca8cf0405d6
Merge "Remove unused variable and fix outdated comment"