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

Change-Id: I64f6fa7ae31244bd28d51abded337d466e22c46a