jf: de-unify variants

Change-Id: I505167dad2c6172d9915414ab784572f3ae8b720
jf: update ril config prop

Change-Id: Idd05d0db14b6fa89daeaac06795eccc927ddf2c3