Dedupe merges

Change-Id: I9cce208e5709c5412fd570c4044a5e0e8a46dee8