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

Change-Id: I1847da08f92084c311d04caf4011e2e7650e0047