am 84af8889: am d5334121: am 2f8ac2a3: Fix build due to merge of duplicate variable.

* commit '84af88899da58389d30792e717a055b8b5e24cab':
  Fix build due to merge of duplicate variable.