Merge "Fix usage of annotations in TetheringLib" am: 91bb789c20 am: a4dbd9a897

Change-Id: I79463f501e21d2e757956a13ded7432ff45b72bc