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

Change-Id: I9d880df13dec03cf5604c197c5bc4ee99a455693