Merge "Ensure PiP test apis are marked as TestApi"