Merge changes from topic "rename-stream-connect"
am: ad71d42389

Change-Id: I4d651926031dc0342ba77db97669416a86c7fe62