Merge "Marking some hidden API as TestApi." into pi-dev