Merge "Reduce dependency of real device for wm unit test" into udc-dev