Merge "Configure timeout for fmqUnitTest"
am: 5270385240

Change-Id: I395f166b5b37aaf1c714d5af32d9e75d4e01af5b