Cleanup CIR implentation and more props to vendor

Change-Id: Ia1c406f5f2163d6c738664e262a20ed1378b7723