Fix bullhead locking Split out locking from stopping system Normalize ; Change-Id: I0577f72c514d6add96920529c3bfe29e0917917e