Re-commit 117518 and 117519 now that ARM MC test failures are out of the way.