Fix fmqPerformanceTest am: 2dc30e9b94 am: 22da7f1e1c
am: 1f22c66756

Change-Id: Ifa80f8987db9879e10da99debbd8396b480686ae