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

Change-Id: I7e97398a6da4e3e1713885190e09fe188beccf56