Merge "Fix media on W/T"
am: fd3225492b

Change-Id: I7fe13c70afaf0dfc74506b821816ccfb68854672