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

Change-Id: I15286dd1ffc27629a50c319fb0756ab1e8d9eadb