Merge "Use Message instead of GeneratedMessage"