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

Change-Id: I9113a3834136fb7c1f28a4df9c7d02f06ee757c9