am ead371de: Merge "Remove use of \'_\' variable name"

* commit 'ead371ded06fcf14b7af86a92100b0c3c92fd320':
  Remove use of '_' variable name