Merge "Ensure unique name for non-merged modules." am: 489013b6c0

Change-Id: I86334b96620de23598cd957e61c720cd253e419e