rebase from @paxChristos' modified ril

Change-Id: If76ea97c9fe48477f09f8a2bac28627ed88ad673