[ros-diffs] [chorns] 13510: Branch setupapi (again)