Merge changes from topic 'fmq_test_fix' am: e8f31ca238
am: c86163d864

Change-Id: I7d1c227beb0b8cc8cf13a44b58cca50ac1b93e51