Merge "More LOW_4G optimizations"