Merge "Dynamically stop lazy services"
am: c3f007168d

Change-Id: If3e1220fff806581d56574c19689e0313744b10a