Merge "Fix tethering module lib stub default"