Merge "Move MediaMetadata class back to framework"