am aad685ce: am 4c090434: Merge "removing shadowing redeclaration of result"

* commit 'aad685ce001495260a3ce0c9d9284a6ee3ca09c0':
  removing shadowing redeclaration of result