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

Change-Id: Ic72a78a9dc44b2f25b365b7073578836bb8b80d8