RIL update merges, wifi tweaks