Media content message should be in general, not experimental, code

Change-Id: I41f61eb9dd9dccee8bb0be3e12736b5f713dca45
Merge "Media content message should be in general, not experimental, code"