Merge "Tethering: add in-process vs out-of-process flag"