Update to patch set 2: http://review.cyanogenmod.org/#/c/47908/