am bce77997: am ebca76c2: am 9cad1985: Merge "Fix errors caused by unused variables"

* commit 'bce7799786ae712bba9b58f1f99cd12ee05b5cf3':
  Fix errors caused by unused variables