Revert previous RIL commits and match cm with newest additions.

Change-Id: If2451ca61d0924c7ea01abfcc61c4cc9f198d8ce