[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: 905d3b77 -s ours am: 83cebf0b -s ours am: 9d496bf1 -s ours

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

Change-Id: Ie3d2505a061d0e4f9bf79c30b0e38b09e246c67e