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

Change-Id: I57ace313a7acba930645b9cbbc94def5e3efc423