Merge "Add owner for wm policy test"