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