am 46e0f460: Merge "Fix mod-union logic for native roots"

* commit '46e0f460aa233a4a0ac161bfafde164357fe2b26':
  Fix mod-union logic for native roots