Move service to monitoring for all agents.

Change-Id: Ib980e990e9c1f7eba62f51168d6ace6bf6f7d7d9