This reverts commit fbe2c001. Reason for revert: Breaks Netflix/YouTube TV Bug: 112758347 Change-Id: Ia1eba75d3ea8fecec6855f2ab83c23e0b55b63d4