Merge "DO NOT MERGE: test app must be streamed" into nougat-cts-dev
am: 6638d3a5a5  -s ours

Change-Id: Ib393a355e1d8ab29b7f6a846b660c26164a26790