Revert "Sync with Media from CM"

This reverts commit b43bbfc0a3c62f8ba37cc7f30a586e825019d7dd.

Change-Id: I2f976aebe953343791405a5e67a44811f9b49460