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

Change-Id: I53967780480132450ccb43359692da2fe9461e41