Update schema-next for the previous commits

Change-Id: Ie9a6a7f233b2c712a12c28276366a38aa8418765