Fix RIL issues

Change-Id: If90e286b54c4c00f284d32e9082f770160f8926e