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

Change-Id: Ib679444274ce5b763c6bcee11cf584ec72c61fb4