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

Change-Id: Iadfba31b9f8d375e625b350f98efabe07599e79b