Merge "mediaserver.te refactor"