Merge "Tethering: fix using wrong subId problem"