Merge "Mediaserver back to 32-bits"