Merge "Remove hard-coded custom sources from MediaSource" into pi-car-dev