[FIX] Support branched svn directories

Bug: 61310
Change-Id: I1fe2aa0c2cec2b569af5bf0f8b2e0e8f863ee358
Merge "[FIX] Support branched svn directories"