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

Change-Id: I184824d3152cdd431e50aa81fe79bef9de93d990