Commit for CM11 on Nexus One
some other commits must be made in other areas, including qsd8k-common