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

Change-Id: I6cd3f4f2ec6ceb4c586800e3b77273a534f10d4a