Add warn re sorting requirements

Change-Id: I3535789b7f4be8d71a816490417b0ea9f94d7e04
Merge "Add warn re sorting requirements"