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

Change-Id: I631bbb92aefcc436be462a19881a1fb385e608ac