Merged: http://review.cyanogenmod.org/#/c/46286/