jf: Get the fuck out of here.

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