Fix RIL

Another try at fixing RIL. Changes as per CM 10 tree.