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

Change-Id: I2256aaad4016dc2ed6176bff8e9bf897f53b52ae