Merge "Fix failure in CodeItemOverrun on target" am: 436b6231ee am: afd16e91e1
am: 48d1347810

Change-Id: I9665faccff2cfdb1ef762dc758a766010f45fa33