Merge "Prevent agents from delaying system daemon threads" am: ec7d54c13a
am: 7d8a11017a

Change-Id: Id6809108087437b903e3079aad0b69212f080c56