Merge "re-enable support for fdio dvr scenario"