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

Change-Id: Iffb05a856b7c16c15a712cd147842d3e4b5a744c