B-43833 fix broken build due to rms xsd assert
Merge pull request #539 from CoderLisa/fix_rms

B-43833 fix broken build due to rms xsd assert