Merge "Revert "DO NOT MERGE: test app must be streamed"" into nougat-cts-dev