XML Schema

Change-Id: I727317a715ae5bbdc085b717ccc1a3d791378316