Merge "Increase the char limit for the bluetooth tethering strings." into oc-dev