Merge "Remove another test for a private API I'm about to remove."