Merge "Add metrics (and moar logging) for when a service disables itself." into oc-mr1-dev
am: 6f50d16338

Change-Id: Ia7e1893b74bf043d39300b04dc3cc85b18f40d11