Merge "Remove indirect deps" into honolulu