Merge "Add self as OWNER for wm/"