Merged with latest cm Ramdisk!
Merge remote-tracking branch 'upstream/aosp-4.4' into aosp-4.4