Use our mediaprovider

Change-Id: I1ba2b00c147f8f9dd4017ea1077979fb7b6af3da