Merge "Enable code item deduping"
am: 540d4be451

Change-Id: I0fde6bd59b0be3b07d962f2f46ab4743fea9b09b