Merge "Update process state after unbinding a service." into oc-dev am: f57b93cd0a
am: dccddf02a9

Change-Id: I8f4082ac526cdfa6f206ffcdbbc498c38bbfff48