am 155b552b: Merge "Fix start-time setreuid complaints." into honeycomb

* commit '155b552b1d7b8ff705c325ee435022cc135f6486':
  Fix start-time setreuid complaints.