[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 am: 6ad9ddc1 am: 5ba5c3ea -s ours am: 1ca7e437 -s ours

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

Change-Id: Ia79205d091e9db40f453f898a583f169de39c7c3