Merge "tests IFoo: WithFmq is more complicated." am: da1d79bf07
am: 0edb906e6c

Change-Id: Ieab8dc0b936b7b0d7e4215d769ef3b467adab6bc