su640: Brings from cm-10.1