Merge "Adding block kind to protocol for future streaming of a tree." into...
Merge "Adding block kind to protocol for future streaming of a tree." into rvc-dev am: c0a5aff0 am: c422da86 am: 6a3be071
Change-Id: I772c5c473c36d1e6b8077cf51d5c7dc9f5558751