Fix compile in cm-11.0

Change-Id: I3b40fa44c9fa0946fc37ed7eefa11e5467d5e243
Merge branch 'cm-11.0' into martincz