Merge \"Add support for streams with vendor specific formats\"
am: cfbaedf009

Change-Id: Iab6e0c2a0220d8614e1aa64845beb1a01026f423