Merge "Rename property 'schema' to 'type'" am: ceecbfc40e am: c78060f51b
am: fd162d3242

Change-Id: I358050d19897fa5b74bd781f58e3157c8bc014f8