Merge changes from topic "b123318663"

* changes:
  Update LazyServiceRegistrar for tryUnregister.
  Fix race conditions for lazy services.