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

Change-Id: I7d87c12579585370da837dff0bf64e316cfd5097