Merge "Enable code item deduping" am: 540d4be451 am: aa0b43c871
am: 5c05386c9f

Change-Id: I9faece1fbc0ab198e23fed9bf637fec1824953d2