Workaround weirdness when running on Intel devices
am: 724b679133

Change-Id: Id33d0c8b665cb1a1f32f590ad4f531f2ee769cb5