Merge "Make framework-tethering stubs use the new defaults" into rvc-dev am: f4ca25a3 am: 59118d19 Change-Id: I851b1d01e8973b70154775e34662d599787d065b