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: 2e29ea12 am: b046e02f am: 34ab5567
Change-Id: I2c855d7f5c579c55190a5521c8c6fee9832b279f