am 781c3404: am 7793c09e: Merge changes I4e94b8b9,Iae48d489

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