Merge "Attempt to resolve build breakage on x86"