Multiple modules with the same name are going away.

Change-Id: I4154db066865d6031caa3c2c3b94064b2f28076e
2 files changed