Merge "Clean up MediaSource" into pi-car-dev
am: 60774547c4

Change-Id: Ia24cda5090d984b97accecce875cdaa99c3ea21b