Housekeeping, re-alphabetize requirements

Change-Id: I3c4961419de426c84ca65a8f60e6c438ddd2f798