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

Change-Id: Ie949a6cf5d6dfddc763f6e371a38626c86ff3356