Calling restart() without start() is illegal, so don't do that; use start() instead. Pick-to: 6.9 6.8 6.5 Change-Id: I2ff5151f588cb926ccecc3d9997615e63f36ee24 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>