Fix governor start/stop race condition (Thanks to Albinoman887)

Change-Id: I4af87f2105cca93f2b1cb2a34a7e16866ea2c884