fix for cm-11.0

Change-Id: I7c4a209e029b43712a63060c2ad946855737b501