am c02bbfb3: am 9fae2ecc: Merge "Handle nested folder case"

* commit 'c02bbfb3ea64ec9f4f3e6eff796b0bfe571bda9b':
  Handle nested folder case