Merge "Kill FMQ benchmark service once the tests are done"
am: 960a479c15

Change-Id: I33735dd9970e4351f666dc800d57de4a92dbf85f