jf: Get the fuck out of here.

Change-Id: I2ed93cc29c6e21de76cfb27dfad8f73a6baf435e
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0