fix build error caused be merge from cm-11.0