Attempt to fix test failure for armv8. am: f292c6262f am: d4a475f9b3
am: 62325b7eb4

Change-Id: Idb99f01f7065c97e59dfde285aac694569f6a3d2