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

Change-Id: Ia11abf8cb3017907db39c1fc494f54cabcd2ffa5