fix for cm-11.0

Change-Id: I0facf0a27252f0a2175ddecf94d1c7d185a50a8b