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

* commit 'a16280008f66848be443d45fe98fb390b190b96b':
  Fix bug with test 964.