Merge "Fix exclusion overriding local integer_overflow." am: b549e826dd am: a458ab05f5 am: 041ed5a784 am: 5ed442013a
am: 8da1939051

Change-Id: Icf38eb10d6af5f7ad736c5c1737fd5788f2ddbf0