am f9afcad3: am 85d072f2: am 6639985f: Merge "Fix test 087 for interpreter"

* commit 'f9afcad352593c612e8bfa8e2e96cfed1b91352f':
  Fix test 087 for interpreter