Merge "Fix media on W/T" am: fd3225492b am: 20bcca8abd
am: 07c908f12e  -s ours

Change-Id: Ia5f93e5c755cdacf26616ae10841b60f519b943c