Merge "Manually add SignalStrength to preloaded-classes"