am 02f98a26: Merge "Fix loophole in module expansion."

* commit '02f98a26c9e305077f11a5e2f81494dd3a0a2a2c':
  Fix loophole in module expansion.