Merge "Remove switchStreams API."
am: f465d84ebe

Change-Id: Ia2cd7338087ee5283d2241ec260d0649ccd3f2b2