Merge "Remove test annotations from tests requiring package-private access."