Revert "Revert "add legacy paths for otg""

This reverts commit 64edf54dd3b6470b455b43b02b485b847503c50b.