Merge "Add missing transitive dependencies"