Merge "Fix exclusion overriding local integer_overflow." am: b549e826dd
am: a458ab05f5

Change-Id: Ib136b4fc2cabc7dd5bfd10442028b0e01d34dc22