Merge "Restore test API that was removed" into main