Fixing the test to work on all architectures.

Change-Id: I5590fabdbff9d63fd15c5ef728b6ebba230a541e
Merge topic '14538_fix_dereference_null_pointer' into next

7d261389 Fixing the test to work on all architectures.