Merge "Restore right number of expected intents."
tree: 1c627dc4cc903d5cc482845026ef71d83ca5dfcf
  1. tests/