Merge changes from topic 'fmq_test_fix'
am: e8f31ca238

Change-Id: I3301c68913887b2353af022f20078646150fb58d