Merge "Sync media/OWNERS" am: b5d34b3e03  -s ours
am: b3f2ee1b96  -s ours

Change-Id: I5818a204e04a7e5db78143ba4ddbd86ec28fdf08