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

Change-Id: I01ce1e284be9bc4348662799dd01552be4d8d3b8