Make a schema dependency explicit

Change-Id: I7afd0efadc2978d1bf102afaea3557ef5c3851e8
Merge "Make a schema dependency explicit"