Merge "Fix start-time setreuid complaints." into honeycomb