quick build fix

Change-Id: I8b1394c98a4e6c0f7077df7b2f2f0759c3235206
Merge branch 'cm-10.2' into martincz