ServerMethods: Let MediaSet handle Server object

Change-Id: I1cfe4750af6668f4c86f7cc64b7a0fc8cde79bf0