Merge "Make async-stream available to product and vendor am: 5852dea75a am: fbd48a2a8d am: 8220454176 am: 97dd1ae9cf am: 9392347198"