fix for cm-11.0

Change-Id: I08e9671652a85912534e73db73eaa23821de8aaf