port cs id fix to contrib

Change-Id: I2af3fb1d50badcc6bf89719cfa377356821191f7