Incorporate Evan McClain's CM commit

http://review.cyanogenmod.org/#/c/31408/