am 7793c09e: Merge changes I4e94b8b9,Iae48d489

* commit '7793c09ec42bf1a01a5f45f0e723f9a36fcfd9d7':
  Support for multiple modules with the same name is going away.
  Support for multiple modules with the same name is going away.