Merge "Only clear state for force stopped fill service" into oc-dev