Merge "Dynamically stop lazy services" am: c3f007168d am: f380f9c30a am: 8cbea1bb0c

Change-Id: Ia9aea7078dcb9b1c1a78fcb81ef6292d75b85860