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

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