Merge "Remove switchStreams API." am: f465d84ebe
am: 48941f5d90

Change-Id: I739d0f707c60167cf99e1ca5126621a899e607d7