Merge "Make framework-tethering stubs use the new defaults"