Merge "String updates for hotspot speed & compatibility settings" into udc-dev