Merge "Modernize string handling in BandwidthController"