Merge cm-11.0 cyanogenmod branch changes into philz cm-11.0