am 87a02417: am 0f3a5206: am 95d6192b: Merge "fixing bug of shadowing a variable"

* commit '87a02417f65436d1d0e9bf1b5f70f7f9af3d4e7c':
  fixing bug of shadowing a variable