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

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