Merge "Fix proto invalid write type"