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

Change-Id: Iad8f5aa4c821ae444ab56d14aa322db2fa6a61cb