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

Change-Id: I4bc2190dba1afc2274547a00984635cbbc3a4b6b