Merge "Remove implementation details from tethering hidden api flags"