... that was causing test failures on some but not all platforms.

Change-Id: I0d04cd6e540ea2693a3ec8511d615a9b0fecf456