Merge "Add strings for a "Tethering hardware acceleration" setting." into oc-dr1-dev