Update to r3 - Squashed CM commits

Bring inline with CyanogenMod's updates