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

Change-Id: I1a7556339a803f954f8d223ba9fbfbc4520c2d30