Sync up with CM Ramdisk 09-16-2014.