am bd66e7bb: (-s ours) Merge "Remove unused variable"

* commit 'bd66e7bbc48b8aada729fa13feef4086f70cc2f6':
  Remove unused variable