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

* commit '29a631e14703d1705609da27650ecbcf766035a1':
  Remove use of '_' variable name