Attempt to fix test failure for armv8.
am: f292c6262f

Change-Id: I8f7588450519ce5a0532f88e652a8d300925c902