Merge "Don't keep a reference to Service object" into oc-dev
am: 6c6d37d416

Change-Id: If9ba5155f62607fa744aa0892c50d26a9ab9f69b