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

Change-Id: Ia776abd66347622a93c62083d9ff9164de1e4d7d