Merge "Only clear state for force stopped fill service" into oc-dev am: 6bfcc82a4b
am: eebdc4eb66

Change-Id: I6ae48f6a8cc457b57e4a414629aedf7cdae3df49