Merge "Fix USB Tethering" into cm-11.0