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

Change-Id: I87f4859836f16358e2209f9be7b526e5aaae0f75