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

* commit '0f3a520637421830287bb5b41f101e5f456dc4f8':
  fixing bug of shadowing a variable