Affected the switchable decision mechanism and
effectively turned off block level switching, even
though frame level switching was fine.

Change-Id: Id0b19f91ecfae63964e73f1ba7bfeec70179da35