Merge remote-tracking branch 'CyanogenMod/cm-12.0' into test