Merge "Check against xsd for building all matrices" am: 967399407c

Change-Id: Id9b57083bc7af632c641b6ea9bfe3802cfbe5c33