Merge "skip system server fd check on user builds"