Merge "wm/Server.java: add missing @Override annotations"