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

Change-Id: I0ec8b9f54653dda0049af7a8cbb77f1f6fe43bb8