It's no fun to discriminate against m7vzw... Add CIR support

Change-Id: Ia090b38fb85d6a5ddd186590c1a2e6dd237b20b5