This fixes a segfault in nightly tests for 32-bit clang builds. Change-Id: Ie6de357443bc5bc5f3180791f34fce2566c242a9