Merge "Handle code item overruns in cdex code item write" am: 83784ca898 am: c3975d61b0
am: d584c1462a

Change-Id: I2329159598da5da5e048777da9800d67ce75aa87