Merge "Change generated json schema"