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

Change-Id: I9bbbdc0e4ad1e3e48942368bcc1d0c764e62dfd7