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

Change-Id: Iba0a0e66168a5716aa7cfc2f068fa922d19b02e9