resync media-legacy

Change-Id: I1b4d236469433490a48a5c331bd7d72309e1ce6d