Sync with Media from CM

Change-Id: I776712d8c48c177ff5b91cce968c92e84a3ce68a