[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 -s ours
am skip reason: Change-Id Id08cfe41af59bb336889f9edeaf35dc484892997 with SHA-1 fca5d95c is in history
Change-Id: I821b8d878d69421eb2125035708d11178e8725fd