Added cross tech duplicate detection am: 2003c52915
am: a72c5215bd

Change-Id: I23f279adce867a3867d2c6e1579bd7167f7ed418