Merge "qahw: Add support for new stream APIs"