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

* commit '85d072f2d6f4433a5ff5d34bcf2633e886758996':
  Fix test 087 for interpreter