cm: Actually add the custom clientidbase

Change-Id: I8105f2cd13c26777f59f1926f378f52c1152cd0d
Merge branch 'cm-10.2' into martincz