Merge "Remove --no-stream from script."
am: 66946a2cbf

Change-Id: I752da7d86f980aa7b56ad3c8306c952948d0a5e7