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

Change-Id: Idf6c5449fb292b85d85b9a01ec84e336f4c0d4bc