Merge "Fix usage of annotations in TetheringLib"