am 7c208410: am 609d79a0: am c02bbfb3: am 9fae2ecc: Merge "Handle nested folder case"

* commit '7c208410d7d258242bd28435cbe92915f91363fa':
  Handle nested folder case