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

Change-Id: Ia8aa3064b66cc0d8817d39b1031dcc1c28296b14