Merge "Flesh out streaming service management in service"
am: 0268750a94

Change-Id: Ic113214612d3bac03549764f4ade6844986318ba