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

Change-Id: I4d00faf0a430edfb85eeee43b4705e0ee0f6a577