fix to cm-11.0

Change-Id: I0de50c4cc9ac644d183bc79de9d2d280acf9e67a