[automerger skipped] Merge changes from topic "rename-stream-connect" am: ad71d42389 am: 18ea000d7f am: 53cf28d341
am: b3e4cbb217 -s ours
am skip reason: change_id I6d12b7ac360309014a240a321c3cd32b39d8f740 with SHA1 2207c05654 is in history

Change-Id: Ib45e07ca0973a135d08989de932a822ee6981bb0