Merge commit 'f97b21b54e2e35fdfcc8614dedd8692d5a535a5e' * commit 'f97b21b54e2e35fdfcc8614dedd8692d5a535a5e': Undo IMediaContainerService changes
Merge commit 'f97b21b54e2e35fdfcc8614dedd8692d5a535a5e' * commit 'f97b21b54e2e35fdfcc8614dedd8692d5a535a5e': Undo IMediaContainerService changes