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

Change-Id: I14cfceb27b3c95af90b0201f864f7c8d8dffa066