[automerger skipped] Merge "Fix tethering module lib stub default" am: d2ec5841fb am: 6439512cc7 -s ours am: 371f477475 -s ours
am skip reason: Change-Id Iaab154d9d71900284d92d518a086fc1227c00d5c with SHA-1 dc8e0fc1a1 is in history
Change-Id: I00a1d4229dff7ceb56bf1e2469f5ecf0ec5cb34d
This commit is contained in: