Minor fix to base decision on X-CS, not X-Carrier

* Base decisions on X-CS, not on obsolete X-Carrier
* fixed comments: X-Carrier is the obsolete header, not X-CS

Change-Id: I814c127fac957012fba94c0ceecb00041eac4aed