Merge "bringDownServiceLocked() shouldn't complain when mServicesByName..." into oc-dev am: 1f1d372524
am: 6bd5e862e0

Change-Id: I0e8e25da9f3a6bc73bc9954a3ea0379a71c8bbe6