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

* commit '79b46720e606e3db5fff87f672b73613a9a19c69':
  Fix loophole in module expansion.