More exclusions

Change-Id: I229a518f190e9488d31a3006c1d13b1472c366ef