[automerger skipped] Merge "Fix usage of annotations in TetheringLib" am:...
[automerger skipped] Merge "Fix usage of annotations in TetheringLib" am: 91bb789c am: a4dbd9a8 am: 3cea47c7 -s ours
am skip reason: Change-Id I1fae97a1c1e0ba07fa3e2d64cde7650cd26d0acd with SHA-1 eb22daaf is in history
Change-Id: Ifdfeae4e43afd3892ced4964d54e532a1f46e8fc