Merge "Configure timeout for fmqUnitTest" am: 5270385240
am: 2c9034cc78

Change-Id: I596ade13711b7b2077e0d0f0fcded9505768f183