Merge "Allow odrefresh to use FD inherited from compsvc"