Merge "Ensure unique name for non-merged modules." am: 489013b6c0 am: 8d973bd2f8 am: 71eb527474

Change-Id: I6c36cc9ebe49ac95ab2d8b42c2813052cc83ae34