Merge "Remove stream.proto and cpp-streaming-proto generates field name to id mapping by default"