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

Change-Id: I7fac5ab76fac59386185612516cefaa90932662b