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

* commit '08aa3309790672ccc4c9b899fdf4e6162cfbc37a':
  Remove use of '_' variable name