Merge "Define an order for the media source list" into pi-car-dev am: ed81f6fff0 am: d6a5e75e0d am: 6ca47f256c am: c2fe251866
am: 5386d2b6bd

Change-Id: Icd5a0d5ac64d460979abed7dbab303b55a601970