[Bug 225294] Merge Review: authd