Merge "Workaround weirdness when running on Intel devices" into nyc-mr1-dev