Fix string

Change-Id: I7df61e84df57959a5c1d8f99634f62a9e315fec7
Merge remote-tracking branch 'cm/cm-11.0' into HEAD