sort options for consistency

Change-Id: I94f9f1a780e5bc1aa0a1badc52c27f3ab157bebe