[automerger skipped] Merge "Check against xsd for building all matrices" into...

[automerger skipped] Merge "Check against xsd for building all matrices" into rvc-dev am: 64cb2186 am: eff4716f -s ours am: 883ee4c6 -s ours am: 28c56e6d -s ours

am skip reason: Change-Id Id08cfe41af59bb336889f9edeaf35dc484892997 with SHA-1 fca5d95c is in history

Change-Id: Ie8ac5c54e86b1ab4c00bc055e4e2589d12427fdc