Merge "Fix mod-union logic for native roots"