Fixing the schema resolution ordering problem.

Adding changelog

RB=196751
R=jbetz,slim,si-dev
A=jbetz,slim