Merge "Fix bug with test 964." am: 1227d627e0
am: 292c532b78

* commit '292c532b78c073fa696a29efe01490bd3b06ad41':
  Fix bug with test 964.