Fix build

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