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

Change-Id: I43ceff4c7f0ac303371fb981afabef196326c84b