Merge "Fix log spam for media.log" into oc-dev
am: a4fe7d9cd5

Change-Id: Ifba55fb8da18ef39da54766aa96d2581dfdb8112