Merge "Fix failed MediaSourcesLiveDataTest" into pi-car-dev am: cb08cf5ffe
am: 1e9cc97ca8

Change-Id: I83c75b010e80e939733654ad9876a8d9e19c60d7