Add Client State Indication (CSI) support
Add support for google:queue