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

Change-Id: I42dd978a5393d903be7fda66d64a4e39387e0b17