Merge "Merge "Add strings for a "Tethering hardware acceleration" setting." into oc-dr1-dev am: cf694adee3 am: 0c385ebead"