Move CIR props to Vendor 2/2

Change-Id: I401db345b6c29a76a946641c15459b3ed705a64d