requires http://review.cyanogenmod.org/#/c/46495/