Sync JSONSchemas

Change-Id: Ia9a67ce8d777fb5cc8bb711049174d707b79b407