media: Fix merge issues

Change-Id: I89ab96a1ae415822c6d35e244fb3ebed389a1de6