THIS IS NEEDED

Revert "Revert "Manual merge of review.cyanogenmod.org/#/c/27689/1""

This reverts commit 0652bc773e324b03089d5e7e9bd3943821f94313.