am 865d851a: Merge "Remove the obsolete comments and change the misleading var name."

* commit '865d851a8012e13c35d573d98770b7187d32b7f7':
  Remove the obsolete comments and change the misleading var name.