Merge "bringDownServiceLocked() shouldn't complain when mServicesByName..." into oc-dev